Implementing first version of delegate factories for services
Allowing multiple wrapped delegates
Minor CS fixes
Fixing problem with 5.3 compatibility (wrong context for $this)