Gah, command line vs command-line is totally inconsistent throughout, I guess now is as good a time as any to fix that...