Again, stupid command-line interface causing me more effort than relief...
Check commit before this for details.