Converted to the simpler, hand-coded configuration classes I used to use.