Changes from code review, I think. Made typ use ExpLit instead of typ_inner