Fix definition decorators (closes #393)