Rewrite map atom parsing, fix warnings, fix a duplicate property specification bug.