32-bit fixes for parser cleanup