Remove more double refs, fix build
tyyo
Merge branch 'remove-dimensionless' into fix-assignment