Lots of decompilation cleanup