fix compiler warning and minor tweaks (i.e. use antlr_int32_t instead of int, etc.)