Minor: Additional cleanup (and subtle bug fix)

* But, looks like no existing tests are affected by the bug.

Change-Id: I43512f7edbaf48837890cc112aecfb1997873f32
Merge "Minor: Additional cleanup (and subtle bug fix)"