Fix for function calls used as clauses in logical expressions. PR: Obtained from: Submitted by: morten@xml.apache.org Reviewed by: morten@xml.apache.org