Shift collections about and start improving them.

Tests a-coming, after an in-progress radical rewriting.