Cleanup special-cases for prediction