This is the last of the base payroll stuff for bug #8365.