Changes to support the new Eve/Consolate token format changes.