Maybe.  I'd do that a a separate commit, though.  I didn't want to bloat this PR too much, and the most general setImmediate shims include a *lot* of code.