Experimental TCO for Windows (not tested)
Minor style fixes