Merged from instruction/opcode optimizations.  (Includes Java Class
method setting bug and scope bug)