Tweak to the way per-source-file options are specified