Tidied up mapping logic for mapInto
First step in collection support for mapnificent.
Applied cleanup to code base