am 798e6ab6: Merge "Extract special function handling functions into their own namespace."

* commit '798e6ab621314f6cd890a14251d4d12e849a17bb':
  Extract special function handling functions into their own namespace.