fix Terminal -> Expression<Terminal>