Convert more arrays to lists.
Add Guava; tweak some collections.
Fix some assert failures.