Prelim optimization of "common.h"

For drivers.