This also fixes the last remaining tests/fsck failure.
Fortunately, this just means fixing up the function signatures.