Fix crasher

 * Introduced in 4d1f0abc7403a33f0aa4e6c0ee616f2b7b030a09. Tokens are
   still being shared. Requires further work.

 * Some other cleanup while investigating.

Bug: 61298
Change-Id: Iebd2e14bc12d6caddfbac98fea65da0fb8725fab