start cleaving off store-independent code, and rely on more AR implementations