Bit more cleanup, and now complete.