Nope, I’m wrong. The ñ is still a separate letter. It seems, though, that ch, ll, and rr are still considered entire letters, but they’re only to be sorted as if they were individual letters. If I feel like I won’t get too many weird looks, maybe I’ll go around in a bit and ask all of my coworkers how many letters are in the alphabet…