Replacement of NZV-makro #2

This patchset should replace NVZ-makro by EMPTY makro incl. inverting the terms used at.