Revert some whitespace differences compared to the original sources