Merge "Remove two unused `extern`s on function declarations." into main