Small cleanup of new executor code