Re #429. Imported map code from earlier svn branch.