SyntacticAnalyser : Code cleanup. Using genering matcher.