Ensured that comments and TODO items are highlighted properly.