HHH-7909 : Refactor to prepare for supporting non-basic map keys