More on-ground: Faster return + fixing some workarounds.

Question remains if this opens bypasses. At first glance it seems good.