Better support for nondebug compilation