Fix for "Simplified CommonJS Wrapping Running All the Time" and Warmup support improvements