Cleanups that accumulated on other branches
!420 (merged) and some other WiP code accumulated some cleanups that can go in independently.
The first chunk is purely indentation while the last two prepare for less trouble
down the road when making more of the Phoc{Xdg,XWayland}Surface
private (which isn't
far off anymore code wise).
git diff main -w
should hopefully convince a reviewer that nothing broke code wise.