Remove ifdef/endif matching

Replace ifdef/endif matching with simpler highlighting rules