My previous changes was a bit incorrect in nullmodem() case, back them out.