Partial fix Issue 11003 - Improve .di generation

http://d.puremagic.com/issues/show_bug.cgi?id=11003

Use shorthand syntax for eponymous function/aggregate templates