Remove use of macros in mapchooser.