Minor improvement in DRAIN-INPUT-BUFFER.