Fixing things broke by recent dep upgrades.

All tests now pass!