Switch back to upstream versions of dependencies

These now all work correctly with the latest compiler.