Handle nicely the incidental complexity introduced by pre-1.0.0-RC1 changes

[yarwelp]

E.g. stuff mentioned in issue #65 right above where this reference to it goes.