7806: rearranging ...

dependency analysis
intermediate works ...