Move away from C and C++ commenting because regex
Rewrite indexing code and change the syntax.