Rearrange config field setup a bit.