tweaks: discard some conditional compilation
Benno Schulenberg authored
5ca765f1