Update scope handling
Cleanup scope handling in spice.Reader