Remove unneeded variable, and no-op change to avoid compile warnings.
Refactor to allow compile and link in separate calls.