Merge "Clean up some global variables in common.h"