More aggressive variable scoping.