Fixing symplified token keychain retrieval