Added Guava... for now.

We have to check to some serious breakage across the board before we can
release.
Changed /remove[above|below], //set to use visitors.