Fix issue 12347 - adjoin!SingleFun does not ...

...return a tuple
Fix buggy MapType template