Changes to get the examples working in markup format.