Integrated some of Paul's suggestions from 26-Mar-2013.

svn path=/sandbox/; revision=83594