Removed typecheck for empty validator (it already did that) (attempt 2)

Let's hope this one merges without trouble.

Split it into two commits, one for cleanup and one for the actual fix