Merge "Avoid implicit globals"