tweaks: write two pieces of conditionalized code like all others
Benno Schulenberg authored
Also trim or improve a few comments.
c5f49167