Make a few changes to start preping for MapMessage support.
2 files changed