'isNonZeroLength' macro has been improved.