Improve efficiency of conversion from GoalTO to Goal