Is there a reason you need to move this block around? If not, I'd prefer to keep the diff as simple as possible.