Issue #2198325 by fietserwin: GetPathToken not in ImageStyleInterface (+2 other minor cleanups).