Small semantic improvements to options system, further changes to FileProprietor