More tweaks to identify type.