Reverted conditional removal of with_goal/2