Made Extract-SourceTODOs a bit smarter