Attempt to port to ASDF2 -- tested only on ASDF1 though