Yes; in general, in this pull request it's easier to follow the commits than the final diff.