redone: improved conversion to use a default sink
redone: dfa: added patch for completeness
merge branch 'dfa-conversion-optimisations'