This will require updating in #3, too (noting for myself).