fix up issue with defines() for Maps with null items