Simplify boot storage

I must agree with @mvidner. It really makes a difference when reviewing and helps to realize of your own bad decisions (even temporary decisions can be bad).