Some cleanup on insns.h