Cleanup and simplification.

* Rename upgrade_verify_primary_user back to verify_primary_user
* Simplify the state machine w.r.t. doUpgradePrimaryUser and upgrade_to_primary
* Simplify verify_primary_user's core logic.