Fixed 'Bug 21121 - Aggressive completion for delegates'.