Fix bug with payroll_action field not being permitted.

Also slight code style cleanup.