End files with a newline
Correctly comment the #endif in Match