Merge "Don't reference variables before they are assigned." into nyc-dev