Updates for GNU Prolog (and fix of one error
caught by the singleton variable warning!).
Merge branch 'master' of https://github.com/josefs/autosar