I think the current if/else structure is actually clear because it's two cases (``input_type`` is either ``None`` or not ``None``) and then on of the cases has two sub-cases (either we're seeing the terminal character or not). Will fix the ``+=``.