Code/doc cleanup for general-functions.php