Change upon jsdoc-amddcl/pull/23 and more cleanup.