[matwood]

This is close to what I’ve settled on for 20 years. I’ll also indent again if there are a lot of joins/clauses in the on.