Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.