Minor cleanup and preparation for contrib releases.