Fixes Node.js regression. Slight improved Safari-related factoring.