ref(types): Avoid some any type casting around wrap code

ref(types): Avoid some any type casting around wrap code #2721