Update Spring and Guava, restore missing functionality, and perform some cleanup