Fixed scoped/masking variables.