* Reduced scope.
* Removed unused #define.