Fix usage of intp_t and int_t