flow2: cleanup
Merge branch 'flow-rewrite' of github.com:xzero/x0 into flow-rewrite