Issue #27: simplified die() macro; some changes related to !DEBUG