#209, minor cleanup on #74