Change dependency versions.
Various cleanups.