Oops! Forgot some instances of cross-stage.