Use is* functions.
Remove cli-define module.
1.0.3