In some cases, it is necessary for GenShen to distinguish young and old marking. In other cases, we have modified code to check for young_marking || old_marking. If we instead restored the marking state from upstream and aliased these two other states to it, we could eliminate some of the differences from upstream.