Adjust syntax classes