EAGLESIX-2651: Nary: update subclasses; fix jshint