Use source.decorate when decorator is not specified

Closes #490