Nice!  Moving things into defaults as we touch them.