Switch back to not using forwardable for config.
Cleanup and move booleans to the top.