commit: reduce use of redundant global variables