* fixes for compilation with bison 3.0.2, cleanup
Authored by: mukau 2015-01-20
Parent: [r402]
Child: [r404]