Simplify for new ASM library.