Last chance update before Release (0.6)

The changes include fixes on the lint warnings that were
to *revert* the changes suggested by the (older version of)
lint or manual fix of auto-generated files.  Hmm.