fix some more decompiler cruft