Be a bit more systematic about reseting the read buffer.