Simplify boot storage

Still undocumented!