Yes, that's another change in my more modified fork. I didn't include that here b/c it would've made the PR one all-red file and one all-green file and I figured you'd want to see an actual diff instead. In retrospect, it might've been the wrong choice.

Up to you if you want to rename pre or post merging this.