Cleanup.

Cleaning up variable names, #defines, changes I made because of that
weird “UILFunction is printing line an array” issue, etc.