Fixes to pass JSHint.  And test for timob11403.