[geany/geany] 0998f1: Make code more readable by renaming poorly named macros NZV and NVL