More bookkeeping for prediction context