Command-line scripts simplification for development

This is a followup to #93. 

@akorosov @mortenwh @knutfrode Please test. I don't have the time currently but it should work.