I think it'd be a good idea to change the comment here too, since this no longer takes "the *first* extension only". Could be confusing if this is left in.