Remove diff and make functions

Those ended up causing more problems than they solved, and they're not
very hard to set up on the fly.