Again, if these are removed from a future JDK we'll need to move this transform to the bytecode deobfuscator.