Fix parsing of 'logical' conditional elements