ENH: Reduced orca2 complexity