WyC: added back support for empty maps.