Tighten our dependency on orc