Instead of trying to manage upstream configuration options, just keep using our freeform options so we can do less finicky logic and workarounds.
We will support more, might as well properly organize them.