Restore some reverted fixes for spelling, newlines and __linux__ macro.