Ah, forgot to do that, and I don't really want to wait 20 hours for Travis to build again.  It's a good perf improvement, tho, so separate PR?