Expanded config handling. Fixes [00962e4d5d] and [381a103023]