Reduce Scoped size

Reduces it by at least 8, maximum 16 bytes.
More Scoped fix