[XFS] Rework code snippets slightly to remove remaining recent-gcc