Fix Marcos' comments, and clean up the requirement on functions that receive an invalid UUID.