More factoring flx.
Merge branch 'master' of github.com:felix-lang/felix