Proper fix for JENA-652 : consider each expression separately

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1577924 13f79535-47bb-0310-9956-ffa450edef68