Add "dict" magic words.
Fix some issues.