Refactor flow tree construction and actually use display property

Eliminates a level of indirection in flow tree construction and uses 'display' to construct flows.