Splitting out swap handling and rewriting to a live-boot subscript.