Defaults: change to GoalValidator to apply defaults after structures are bound (#1136)