Make type parameters consistent across library.