(cherry picked from commit 6af69f851a)
6af69f851a
Fix various code formatting issues and argument names.