Minor reorganization, and more derp-fixing.