Clean up lib/override somewhat.
Bump dep commits.