Cleaning up a bunch of things for the indigo move. Things aren't quite
working perfectly, but they are close.