why are these now named DEFAULT_XXX ?  are there any non-defaults?  (looks to me like there isn't even any way to wire up a non-default.)