Merge "Refactor use of services in InputMappers."