This addresses some nits from I1f2e8fa61d6dfecd8395a1f894f74ec5bcb5573c that were not worth holding up that review to address. Change-Id: Iab60d5622dddf29871fbbc9f51deb93de26235e8