Incorporated latest jqAssistant changes.