@mdboom - equivalencies get assigned here.  Note also that `tunit=self`; this is the reason the check of the equivalencies had to be adapted. Still wonderful how well it works, though!