Fix some false positives and a typo
Add deduplicated dotXcompose syms, and start merging them