Fix jscheck to also deal with #expand directives for bootstrapper
Revive bootstrapper