am 97e48731: Fix Nick\'s nits

* commit '97e487311b1cb780dfd3b0994917c72047d6188f':
  Fix Nick's nits