Reverting changes to improve performance by changing scope of variables since it makes not a big difference and probably rather worsens performance.
Authored by: komeiste 2009-06-01
Parent: [r7225]
Child: [r7227]
