Add back "0 + 1*x" prints as "x" functionality

tests galore!