Some more refining the the defaults system.