> You removed the @w{...}, which IMO is important with long
> expressions.  Other than that, looks good.

You're right. I got it right in the email, so I don't know what happened there.

How's this?