Fix -Wextra warnings

Inspired by #14 from @sth. I'm AFK so using a PR to merge this.