[wip] Cleaning up some requires here and there.