Same comment for code moves, if that's not important for your modifiation, you may keep code move for another patch.