Fix all violations related to final variables