ASM refactoring

Ok.  I'll pull that one in instead.