switch from #matches? to #call to allow procs instead of classes