Plus a few minor code readability improvements. Bug: webrtc:10480 Change-Id: I590d8e203b1d05959a8c15373841e37abe83237e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/195334 Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32764}