Minor command-arg fixups for Frameworks/Service/Main