By consistently using the `DefinitionMap` class there is no longer any need for the `mapToMapExpression()` function. PR Close #41080
By consistently using the `DefinitionMap` class there is no longer any need for the `mapToMapExpression()` function. PR Close #41080