More optimization of delegate invocation