Rewrite SaveStatePostLoad into macro