Some TerminalSerializer improvements