Support nested scopes more cleanly
Version bump