Cleanup unification functions a bit more

* Just noodling at this point, but this looks much cleaner.