Some more cleanup, plus a proposal for tests