#59 Returning proper HashMaps with "inject" rather than collections of map entries with "collectEntries"