Pippin, I also have a 99 facelift model, and you are right about changing the winkers.
Remove front grille and headlamps then winker bulbs easily accesible.
Now I have confirmed you are correct, can we come to some arrangment on the massive discount you will arrnge for me at your hotel!