Support fun and function (refs #5)