Correct scope for class name
Fix highlighting for parameters in function declarations
Touchup