Simplified cmdline.jl somewhat. Need comments next.