Bringing up to date with https://codereview.appspot.com/10181043/ and parts of https://codereview.appspot.com/10075043/


git-svn-id: http://es-lab.googlecode.com/svn/trunk@813 aeea10e6-ec39-11de-83d8-6d5adf01d787
Having accidentally updated this with only the comments modified, revised those comments to make clear they are referring to changes not implemented yet.


git-svn-id: http://es-lab.googlecode.com/svn/trunk@814 aeea10e6-ec39-11de-83d8-6d5adf01d787