Simplify code generated for calls to classes and functions