previous code doesn't respect python semantics

Need to fix up test/expressions