Better occurrence typing updates for maps
Better error reporting for HMap syntax