Fix overly restrictive types in measure ops.