Cleanup and changelog for #948.