Fix ambiguous uses in doctests.

Not sure if these are all the best ways to handle these, but I feel
like it's important to have passing doctests.
Merge pull request #427 from startling/passing-doctests

Fix ambiguous uses in doctests.