Fixing some whitespace mods that will impact pull from jantje's latest.