Mods to allow full parse of C files