Fix pps report regression due to code re-org.