Remove @SuppressWarnings("nls") cruft.

Also rewrite a couple of toString methods for clarity.

Change-Id: Ic6e8c474ef87e0c0550eea2daed611ae41118229
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.