Don't do flow control if we didn't ask for it, and a small refactor