Remove record template parameter from Map/GroupBy

This breaks things until records are changed into templated form