More singlespace to doublespace fixes.
Armor too.
Merge pull request #8198 from Rivet-the-Zombie/out-out-damned-singlespace

More singlespace to doublespace fixes.