Now split out into undirom.c and undiload.c