Do you still need the debugging output of the native(?) mode lines and want me to apply your patch and test it?