Minimized dependencies.

I know this is a huge commit, but it had to be done atomically.