fix previous patch: fix division/zero bug in lexer

occurred only in dead #elif branch
Merge branch 'master' into WriteCFG
fixed serialization of CFG composition