Revert "Don't override the syntax classes for "-" and "_""

This reverts commit d19542f4131b3e6d94655ab6c7403442bf2cc332.