Remodel AOM C_PRIMITIVE types