Fixes from @graphicore

And then make rules and dictionaryRules consistent