am a1ab5a8e: am 97e48731: Fix Nick\'s nits

* commit 'a1ab5a8ecf4fe806732e9ecec0c471a7a7329ea9':
  Fix Nick's nits