Yup, you're right. I'll change this PR to just the one change, you can do the others.