GSW: some minor updates to the examples so they use the new syntax.