EAGLESIX-812 Add fixes for expression jshint errors