Change scalar_symbol into expr
Merge pull request #682 from cpcloud/remove-scalar-symbol

Change scalar_symbol into expr