Add informative comment, and use 'auto' in a couple of places where sensible

Change-Id: Ia01404f8d0a5e5aa94d8a9b3f45421950831c5cb