Issue 545: Code cleanup

https://code.google.com/p/esprima/issues/detail?id=545
Issue 546: Tests cannot be run on Windows

https://code.google.com/p/esprima/issues/detail?id=546
Merge commit '28a9cd2cf96b7c6c41ba39295c19a6d10148e258' into Issue553