Fixing compile time errors after comet-mapping-format refactorings.