Cleanup based on suggestions made on an earlier patch.

Change-Id: I1121201510094542cd4835badc8c20a908afda1a