Clean up armdefs.h