Adjust NumberZap to latest changes in Enigma2