More minor User model refactoring.