Merge: Tweak programming faq examples so that it (mostly) passes doctest.