Interesting.. I'll take a peek at the python code and see if they do something to resolve known conflicting keywords. 

In terms of resolver, just mapping known conflicting keywords to values.