A bit of code and spec reorganization.