slight code simplification
clean up and improve static type declarations in FlowControl.py a bit