Fix some -Wshadow warnings.