Better modularity of expressions, types and substs