Fixed redundancies in struct patterns

If merged with other pull request, this will fix `make` and `make test`. Sorry for not putting them into one, I can do that if necessary.