Improve commenting in various places.