Keep appstats enabled
Merge branch 'simple_unformatter'
Further robustness improvements
Merge branch 'parsing_improvements'
Merge branch 'simple_unformatter'
Style improvements as requested
Merge branch 'parsing_improvements'