Also I meant to ask -- IIRC I think your patch didn't touch tui/?
Perhaps no change was needed there though.