Apparently, somewhere in the process of trying to get ComfyUI to run Flux, my PC has decided to ignore all .yaml files when running either Comfy, Forge, or A1111 - and the vast majority of my custom model merges utilize them, and are thus broken. Ugh. Here's one in memory of the hard work I've lost.