Remove a few NULLs

Just {} is used in a lot of places now, and there's nothing
special abose those few.
fileio: in envfiles, do not skip lines following empty lines

https://bugs.freedesktop.org/show_bug.cgi?id=63477