ditch: No longer necessary as I've dropped the use of prefix tokens