The logic for expanding system properties should be in its own class.  It is a separate concept from the extractor settings.  Plus, it's easier to unit test if it is in a separate class.  Are there any tests for this functionality?