cleanup extra::bigint

This also fixes #4393.