Cleanup matching of internal forms and replace syntax-kern-case with syntax-parse