I think with this I've addressed every comment in the initial PR.
rekkanoryo/theming-page-migration
2020-06-07, John Bailey