Minor delegate improvements.