Fixup after 3a730df (Avoid pointer arithmetic on void*[...])