More work on getting maptool to use the new unified graphics stuff.