Change Measure back to not using Scalar v

It makes some of the type hackery in diagrams-lib a bit simpler.