Note that I'm not against changing it, I'm just surprised on why that other code seems to be used at various place... where does it come from?

I did the other changes you listed above, except for the Typ 2, I still have to do these (a little more work, I'll maybe do that later today or tomorrow).