everything in this patch looks good besides this change. can you make this change in separate commit? that'd make things easier. thanks for your understanding :)