Updates for conversion of 4.x to 5.0 form

Commits made for the 8/19/13 sprint on converting 4.x examples to 5.0 form.
Neglected to issue PR at the time...