Since the option system now handles all the path expansion automatically, these recent changes can be reverted for simplicity. This reverts commit be15be3a83.
be15be3a83