Issue #9: small clean-ups.