Improved WaterLexer.