(Note that nonzero/non-zero is also inconsistent but was not fixed.) original commit: 1715ba8c0f423ea96bdbc58e287da7db18a19c01
original commit: 47a210c15c63ba9677852269447bd2f2598b51fe