Couple small cleanup and dependency changes.