OK I split out the variants in 542fd89 and added a todo to unify them at some point down the line. Assuming Travis OKs the build, I don't see anything preventing this from going to master. Let me know.