Fix build, does anyone even bother testing these modernizations-by-rote? (nw)