am a97c1075: Merge "Fix Nick\'s nits"

* commit 'a97c10755442e3800c0b1011d986d554ce2096db':
  Fix Nick's nits