These 2 patches are not complicated, it won't be difficult to review if merging them into one as long as the commit message mentions it clearly. Anyway I'm fine if you hope to keep them into two patches.