Correct Enum.group_by/3 typespec
Inline some map calls