Part 1 of many cleanups.