Switch maps to use the new Distribution fields. (#371)