Reapplying a couple of simple deleted patch

When we reverted the repo following the callback.h debacle a couple of other patches got squashed. These two are pretty conservative and I think we should re-apply them.