Fix "unused parameter/variable" warnings. Cleanup whitespace. Original patch by @huguesmorisset.
Differential revision: D10115