Improve dependencies.

cc: @chadaustin