Also made sample code better PEP8-compliant, and fixed a minor typo in
an error message.

Fixes gh-1353