Replace calculated "sample_type" property with an alias

The calculated property implementation was returning the old value when
running updates.  Rather than fix it, just stop using it altogether.