am e3d598e2: Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"

* commit 'e3d598e240dd9ac26b4894dbb1312f42c4047fb3':
  cleanup: Replace pointers with out-parameters and fix-up formatting