Refactor CESyntaxManager a bit