Small cleanup of System.Console.cs file