Small refactoring in UNIX/Flow.