WIP general: bug fixes

Okay, I see.

btw, `remove_oauth_token` does 2×n requests when 1 should be more than enough.