Refactore set indirect (GoalIndirect) to resolve share refs at resolve time not parse time