Make examples conform to spec

Hoping this passes integration now.