Remove dependency to CPP: new parser that handles comments