Replace simpleTypeIDByType
with a bimap
#2775
Merged
simpleTypeIDByType
with a bimap
#2775