diff --git a/.travis.yml b/.travis.yml
index 89ff2805..e2c5df1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,14 @@ before_install:
  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
  - sudo apt-get update -qq
  - sudo apt-get build-dep rtorrent libtorrent-dev
+
+ - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.7; fi
+ - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
+
 # prevent `macro `AM_PATH_CPPUNIT' not found in library` in `autogen.sh`
- - sudo apt-get install libcppunit-dev gcc-4.7 g++-4.7
-# `autogen.sh` doesn't call `configure`
- - export CC=gcc-4.7 && export CXX=g++-4.7
- - git clone https://github.com/rakshasa/libtorrent.git && cd libtorrent && ./autogen.sh && configure && make -j24 && sudo make install && cd ..
+ - sudo apt-get install libcppunit-dev
+
+ - git clone https://github.com/rakshasa/libtorrent.git && cd libtorrent && ./autogen.sh && configure && make -j12 && sudo make install && cd ..
 
 # Figure out how to fix the issue running 'make check'.
-script: ./autogen.sh && ./configure && make -j24 && make -j24 && sudo make install
+script: ./autogen.sh && ./configure && make -j12 && sudo make install
diff --git a/src/command_dynamic.cc b/src/command_dynamic.cc
index ed6cedcf..91eb3c46 100644
--- a/src/command_dynamic.cc
+++ b/src/command_dynamic.cc
@@ -247,6 +247,10 @@ system_method_insert(const torrent::Object::list_type& args) {
 
   const std::string& options = itrArgs->as_string();
 
+  // TODO: Replace find with a method that does '|' separated search
+  // for all valid options, and then cross-checks that unmixable ones
+  // aren't in there. Use a bitfield.
+
   if (options.find("private") != std::string::npos)
     flags &= ~rpc::CommandMap::flag_public_xmlrpc;
   if (options.find("const") != std::string::npos)
@@ -289,8 +293,7 @@ system_method_insert(const torrent::Object::list_type& args) {
   } else if (options.find("value") != std::string::npos ||
              options.find("bool") != std::string::npos ||
              options.find("string") != std::string::npos ||
-             options.find("list") != std::string::npos ||
-             options.find("simple") != std::string::npos) {
+             options.find("list") != std::string::npos) {
     torrent::Object::list_type new_args;
     new_args.push_back(rawKey);