Simplify generic type params