Tidy Gaku::CLI a bit