Specify scope of prepopulators.  #2744.