Removed redundant functions.

These seem to have been leftovers from the old annotations branch; they should
not have been carried over, as they were moved into other modules since.
Another fix-up from the old branch merge.

This should address the issue with the failing pypy test.