Resolving the last of the jslint issues