Splitting it into separate rules is probably a better idea. But I'm going to leave it like this because I think this isn't too funky. If someone shows up to help and balks at this, then we can revisit the "this isn't too funky" opinion.