Fixing a bug in inline expressions

* In case if nested expression evaluated to 0 it was replaced
  with original expression by mistake
* Small renaming in data_flow.py

Change-Id: I86e3a226548d60c144b1677e8d142d8ab5847615