Avoid using an element buffer in more cases.