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