Reduce patterns duplication

Not sure I got everything right but it looks like those patterns can be merged.