Refactored the Mapper to use a FormattedDate object which people (like me) can just return directly if they prefer.