Revert "fix remaining -Wextra issues"

This reverts commit 486bf7a3258e39fd5679f2b6c02fc32e58a835dc.