On the other hand, if you're doing this work anyway, why not keep a specific list of features you've added? We can then think about what can be folded in.