Revert "Revert "More JSCS fixes""

Reverts guardian/frontend#6826