Undo some (but not all) of the more lenient acceptance of

(AttributeError, TypeError) -- the leniency wasn't needed everywhere.