Minor change to class, interface and trait validation