Merge "Clean up our termios implementation."