I don't know how I missed them. I think I must've made a mistake while heavily rebasing this branch; it's the second time I'm surprised to not find certain changes I'm confident I did.