Chase changes to END handling.
Eliminate a pir::.