Note to reviewers, this - while out of scope of this feature - is a cleanup of a previous slightly incorrect migration