A few good suggestions were made on the final round of reviews
on the previous patch to add v3 token support, but were not
implemented. This patch applies these, which should not create
any functional change.
Fixes Bug #1154768
Change-Id: Ie5408a5477d176bd28b2c385e49cd29b39c0de39