Simplify pattern maching for hayoo data structures