Related to #10634, what might also be useful here is to do some code deduplication, to make this easier to maintain. Currently there's a lot of copy-and-paste.