Improve type specs.