I think this fixes the issues seen with chained expressions + conditionals
closes gh-47