Move away from Struct-based formatter implementations
Use formatter pluralize helper