More configuration convenience functions, and use in phase 1.