Thanks for the correction. I'd prefer them split into a separate commit.