short is a reserved word in javascript

See http://www.w3schools.com/js/js_reserved.asp
[sailfish] Simplify
Merge pull request #105 from michael-k/0.4.4-fixups

0.4.4 fixups