This is in preparation for a PR, to reduce potential for merge conflicts
with either my PR or others', since mine will modify a large amount of
the main file.
1. Do some temporary style modifications to help make the code more readable
for profiling (with help from ESLint).
2. Profile the code, and optimize accordingly.
