Separate things out a little more coherently.

Rearranging, mostly.