> Ok with those changes.
>

I am reposting since the rebase want trivial; I change the template 
symbol code to take advantage of this clean up.

Is this cool ?

Sami