Use eval instead of vm.runInThisContext
Minor makefile tweak for concurrent builds
Minor tweak in tests
Minor whitespace