Whitespace cleanup.
Mark some unused variables explicitly to silence warnings.