* fixes for compilation with bison 3.0.2 (?)
Authored by: mukau 2015-01-19
Parent: [r401]
Child: [r403]