This finishes the payroll work on bug #8369.