Fixed flow folding, and made the separation slightly cleaner (but the whole scanscalar thing could use a major refactoring)