ESourceSelector cleanups.