Move eliding condition out of drawing loop