stave and staves rather than staff and staffs.

And here I thought it was staff (s) and staves (pl).

Atomica says staff = stave, and plural of staff can be staffs or staves. So we're all right, then. Live and learn!