Small cleanup in map drawing code.