Separate Expander implementation and remove the newtype for flow_control

Since the block were accessed directly almost everywhere, there was no
need for a newtype pattern. It also is not a user-facing datastructure,
so no encapsulation is really needed