Patch Set 4: I would prefer that you didn't submit this; No score

Don't bother with ?y comments on CRs for now. A few
other cosmetics issues though.

As for the service tracker calls I cannot tell.