#94, #692 - add backwards compatibility

The change introduced in #692 should have had some backwards compatibility for the Pyro interface change - this implements some handling for it.

@arjclark, please review.