Cleaned up patch comments.  Most of these came from upstream.