Finished making the map-selector work in strict mode.