Move space addition to implementation.
Merge pull request #1036 from albertvolkman/entity-mapper-remove-extra-space

Move space addition to implementation.