More Prediction and Control will not Break our Flat-line Safety Results