fix processing of constants
Merge branch 'master' of github.com:w3c/testharness.js