Fixed rewriting problem with component instantiations involving more than one argument.