More work collapsing strcmps