Fix potential scoping issues.