Remove nil test and code in met_when criteria helper