Fix AHIK simulation and re-enable distinct operands.