Typing

I am not sure it's a good reason to delay the change :-/
But I agree it's tedious. @joker-eph would bash you.