Adjust skirmish replacements.
Remove session.xml as the upstream version is changing a lot currently,
and because there is a patch in the review queue that should make that
exact change easier (without copying the whole file).