Performance enhancements

More use of delegates.
Remove unnecessary internal only function calls