Applies #11703 without test_features and with additional predecessor_id
check to make sure only we can trigger large witness.

Also includes `cargo fmt` changes.