More ioa_ edit token enhancements.