Simplify boot storage

This is totally obscure unless you can read the stubbed target map in another window. Please do make a factory soon.