Major reorganization of interpreter code