I still don't like this, and won't personally merge it as is, without further input from anyone else.