Improved word type checking.