Update for some changes in JOSM r16641.

This was primarily a change to an enum from boolean options for
OsmReader.