Improve type symbol matching