Squelch some compiler warnings in NOLIVE mode and simplify #ifdefs.