Extend dice pattern matching significantly