tidied up commdefs.h