Improved error handling.
Begin of rewrite inline function call in expressions.