elm_map - Bug fix and cleanup.