Blegh, but should commit progress

World's messiest commit, but I ought to do so, and it's late.