Fix up generics in expression evals
dev checkpoint