Remove ExpType and fromDecl from internal representation.