Clean up some warnings and comments in preparation for a merge request.