Merge "Address style and efficiency post-merge feedback from previous change (1ecee447abffbc97e2d8bbd7df6252cf9827acf1)."