jump forward to current index of wip-engine-rewrite
more specific un-shivving
fix namespace problems caused by self-deps
fix self-deps in define()
fix infighting between git instances on unshiv