Further minimisation of when MappingStrategyHelper is called