Fixed D Herring's examples for new types.