ARC-ify and switch to ButteredDisk submodule