Fix struct patterns in match