Fixed occasional double-quoting of label names