Unify collision

This should fix just about everything. If it (somehow) doesn't, then whatever it introduces will surely be a hell of a lot less obnoxious than the bugs we've dealt with for so long.