[MONDRIAN-1616] Switched to using Collections.singletonList.