Still trying to fix this; will san-check this again when I've gotten
more sleep

but I *THINK* I've converted this file to using choices by now.