Pending changes in common.h and stylistic changes