Make access tokens work as they should when expires_in is null.

I've described my changes fairly well in the commit messages, so see those.