Backport structuring expressions and style changes from bites