Switch back to stripping the leading newline
Switch back to stripping the leading newline

But optionally this time. Also includes some other small changes.
johnno1962a/swift-evolution,johnno1962a/swift-evolution