One measurement to rule them all

Replace the polymorphic Measurement and its implementations with a single, concrete Measurement class

Note: this is on top of !1359 (merged)