03: Minor delegates rewrite