Handle CQL diagnostics better. Use present always for SRW-to-Z.