correct type of binary comparison ops
flatten module names (make emacs/flycheck happy)