Formatting tweaks.
Most mapper constructors will return the protocol type instead of the concrete implementation class.