Also removed anonymous functions for directives. Relates to #17