Improve PropositionSourceGuesser