Since this replicates what's also done in `__init__` maybe factor into a helper function?