Changelog and cleanup from #838.