Making compatible with new multiple return value semantics.