Minor ast changes to if and initialization