Config feature cleanup

Fixing some side effects of #1846 and #1900.