Wasn't happy with the config refactor, so I refactored it again to be more
correct.