Updated parser & leer to be usable with re2c
Fixes some weird temporary compilation errors too