Use a separate buffer for <disk><driver>
    
    Eliminate the big condition at the start.
    Instead use a buffer and only format the element if the buffer
    is non-empty.