Does this mutate MAPPER?  If yes, isn't that a problem? If no, would it make sense to have a separate static "NON_NULL_MAPPER" so we don't need to create a new mapper for every step? Any performance risk there? 