This change does the basic conversion (let/const, member function sugar, fix up

and add documentation comments), but also consolidates the code a bit to remove

extra helper functions that were only called from one place and didn't help

structure the code any better.
This is in preparation for the high-DPI image review feature.

Ran unit tests.
Used in conjunction with other changes.