This change brings the spec, which was agreed upon nearly a year ago, into alignment with the current proposed implementation. It also cleans up some formatting and style issues. Change-Id: I0bd99d24517b90f16557aadc3d721ecee9cd8eb5