More cleanup of check_user_full with no functional change