Check every key (regardless of compute_from) for discouraged condition

Check every key (regardless of compute_from) for discouraged condition #4767