Merge changes from topic 'nfc-style'

* changes:
  nfc: reflect style guide.
  nfc: update default implementation to match style.