Have we grown `equivalencies` as members of Units again?  I can't see where these actually get assigned here, though...