Switch to let validator do the type checking