A couple more auth.go cleanups