Ensuring nested Map value types are correctly wrapped with parenthenses