Changes to the build stuff, towards the bundle-building stuff.