With these changes the boot wrapper successfully builds,
although this may not be the absolute best way to do things.