Rework configuration to be more straightforward.