Fix some mod_include bugs which broke the evaluation of some expressions. There are a few instances of the same basic problem which are not yet fixed and which I have marked with /* XXX.*FUBAR*/. PR: 10108