some refactorings
Merge remote-tracking branch 'gh/master'

* gh/master:
  Changed <exec> to <expr>.