Updated examples to new macro syntax.