Correct two errors in the elaboration of dictionaries and exprssions.
Now pass all 'good' tests.