Use implicit port connections in place of AUTOINST.
Since these connections were autogenerated anyway, this shouldn't change much, except
there is much less text.  The implicit port connections also have stricter rules.

http://www.sunburst-design.com/papers/CummingsDesignCon2005_SystemVerilog_ImplicitPorts.pdf