And yet another pass at cleaning up ordering.
am: 221249dc6e

* commit '221249dc6e37e8c6eb9201e97169bbf906ee1e4d':
  And yet another pass at cleaning up ordering.