Hmm, good point @mdboom.  But there are a lot of places where we've been doing this already,  so we'll have to go correct it all en masse in the future.  

I guess if you think this will be merged soon, I'd say go ahead and accept this, as it might still take more time for #1826 to get working (lots of Sphinx black magic going on there...).  We'll probably want to try to find an automated way to take care of it anyway after #1826...