ENYO-2788: initialise to null instead of undefined
ENYO-2788: fix typo in comment
ENYO-2788: Simplified if else blocks
ENYO-2788: added a FIXME comment
ENYO-2788: Merge branch 'ENYO-2788' of github.com:enyojs/ares-project into ENYO-2788