Updates for the new SpiffyUser refactors.