Fixed stray self.data reference.

Change-Id: I32e8e9f56990cf68d24519a87e559b9480d191e8
More fixes and cleanup.

Change-Id: Ie520dffce67fddfe60cab62f252b3cc396f85abe
fix one-line merge conflict