Some small performance improvements and new language features into use

[tonihele]

Mostly automatic adjustments. Taking new language features into use and some minor optimizations.