Fix handling of remaining command line arguments (broken by previous commit).
Fix parsing of "==~branch" style dependency version specifiers.