style: Tweak the UA style a little bit.
Merge pull request #3499 from pcwalton/ua-fixes

style: Tweak the UA style a little bit.

Reviewed-by: SimonSapin