Magic-number and state-arithmetic removal.