Slight reorganization.

Reviewed by @tolmasky.