Fixed up integration of new config code.
Fixed up integration of new config code.