Fix type resolution of addition/subtraction to be left-recursive
Merge branch 'master' of github.com:SWI-Prolog/packages-cql