more AS2 deobfuscation fixes & cleanup