Merge-worthy work

Changes intended to pass the same professional bar as human-written code before merge.

Merge-worthy work — Changes intended to pass the same professional bar as human-written code before merge..