Drop compatibility wrappers

I also verified that type inference is unable to infer the argument
count. I can live with that.