I totally agree with you concerning some separate refactoring PRs.