Minimal changes to survive with new ASDF.