Better, consistent handling of -literal/-value in the cond collapser