Provide some missing javadoc, make some things a little more explicit, etc. Change-Id: Ibcdeaa10c641436009a3494b18cecae6f816b75e