Don't turn GIVENNAME into G-I-V-...

Previous bug-fix was a bit over-keen on splitting initials out. We'll now limit
it to a block(s) of upto 3 uppercase letters.