Fix PAXWICKET-409 SCAN should be the default for injection source and
some cleanup