Roll-out LatourAndOrder (hacky workarounds)