Add with_scopes_if_required helper (#65)

2 files changed