s3:auth: Tidy up some of the API confusion in create_token_from_XXX() calls.