Final tweaks for type recogniztion.