Feature duplication in command_line and configuration

attempt to close #1290
Restore it here please, we'd like to reduce the number of files thats the whole point.