Minor modifications to make it compile with previous refactorings. The only substantial change to the original is moving the getElementHistory function from ComplexGeoData to MappedName so that the dehash function can remain private.