A bit of collapse after the explosions
Using lab for tests.  Spumko fanboy here.
The teensiest reorganization.  Smaller than this commit message.