LPS-35981 Part II

Hi Brian,

I tries to split the remaining changes so that it is easier to follow from the diffs. Let me know if this is better. I'm trying to get sense here of the granularity you need.

I ran format-source, so if you run it and it finds anything there is something going on at my side...

Zs.