Yep, it was on my mind. I didn't want to make this PR huge.