Deal better with indirection and indirection accounting, developed