Small clean up in component instantiation

Review URL: https://chromiumcodereview.appspot.com//12386060