Add some string changes and annotations to help me read the objects as they are printed.
Merge branch 'groovy-devel' of github.com:mbforbes/pr2_pbd into groovy-devel