cl spec: More ambiguity resolution.