#32 fixed match warnings by instrumenting selector as a tree