Get rid of Expression type alias that messes up with implicits, close #1148