Various fixups (most suggested by Armin Rigo).
3 files changed