[requirejs] Cleanup 92cfec00b18028984d132f0e08f8902b4308b1d5
[requirejs] Cleanup 92cfec00b18028984d132f0e08f8902b4308b1d5

Fix odd indirect code and one bug introduced by trying to put
two statements under an if without braces.

Issue #569

marijnh/tern,neoclide/tern,messfairy/tern,othree/tern,emacsmirror/tern,emacsmirror/tern,anandthakker/tern,fileability/tern,emallson/tern,talyian/tern,talyian/tern,anandthakker/tern,albertinad/tern,albertinad/tern,othree/tern,adrianton3/tern,neoclide/tern,dorellang/tern,emallson/tern,anandthakker/tern,messfairy/tern,cdosborn/tern,dorellang/tern,talyian/tern,mcanthony/tern,emacsmirror/tern,cdosborn/tern,adrianton3/tern,emallson/tern,fileability/tern,MarcelGerber/tern,jgiles/tern,ternjs/tern,adrianton3/tern,dorellang/tern,mcanthony/tern,othree/tern,mcanthony/tern,ternjs/tern,rustemferreira/tern,messfairy/tern,marijnh/tern,neoclide/tern,ternjs/tern,marijnh/tern,jgiles/tern,rustemferreira/tern,albertinad/tern,cdosborn/tern,MarcelGerber/tern,jgiles/tern,fileability/tern,rustemferreira/tern,MarcelGerber/tern