Further simplification.
Reorganization to help me think about things better.