Get `and_call_original` to work properly on class hierarchies.

For #613.