Some cleanup

-- Add EQZ, NEQZ
-- Make things a bit faster