Minor cleanup and changelog for #922