Clean up file source listener.

@rev eric.anderson@
Merge branch 'goliver/master-pending-fsl-fix'