http://david.woodhou.se/cleanup-feature-bits.patch on top of my full
tree?

I'll rework that into the series instead of as a patch on top...