Better handling of YKL classes saved as DC subjects.