I'd like to apply your patch and then rebase my cleanups on it, but it might be not a one second work. Could I ask you to wait until my cleanups are done? I will post the patches within this week.