The astids are non deterministic for some reason
in our toolchain but the storage layouts are always
the same. This adds some code to remove the nondeterminism
but we lose the ability to work with astids. This is fine
for the way that we are using the storage layouts.

fix off by 1
Co-authored-by: Matthew Slipper <me@matthewslipper.com>