Variable declaration refactoring continued.

Such refactoring remains lamentably incomplete, but appears to be inching nigh.