Do two pull requests: one pure refactor, one pure logical change. I've been doing this at work, and it's great!