Compatibility with latest Antioch

This passes all our regression tests; I haven't tried it with anything heavy yet.