Finished converting references to  to the new io::terminal class