Updated LineWrappingHandler, updated MethodCallHandler.