Reduce variable scope.

This resolves #274.
3 files changed