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