tweaks: discard some conditional compilation
2 files changed