Improve 'disabled by default' behaviour

Closes #47.