Make code more readable by renaming poorly named macros NZV and NVL

Closes #159