Use less invasive scopes

Thanks @atmos
Closes #9