Merge pull request #1875 from jonahryandavis/extra-tokens

Fix conformance with -Wextra-tokens