Removed scoped type variables from salsa library (still present in tests)