UMVE: Minor re-photography refactor