[PATCH 2/4] Clean up disk (re)initialization code.