Fix more instances of -Wsentinel on Windows with s/NULL/nullptr/

Follow up to r221940, where I must not have caught em all. NFC