Finished splitting out the top-level ops that require storage access.