Refactor to use module augmentation instead of @ts-expect-error

Refactor to use module augmentation instead of @ts-expect-error #48