[512738] Avoid conditional when's
1 file changed