Rename none/empty to isNone/isEmpty variables

Rename none ti isNone and empty to isEmpty variables. It makes the code
easier to read.
Merge pull request #981 from karlguillotte/master

Rename variables none/empty to isNone/isEmpty