The big refactor to eliminate globals (at least those that interfere with the multi-area viewer) continues.