More code/doc cleanup for admin-functions.php