I merged the latest code and re-applied my change. I'm not sure it falls into your best practices or standard style, but let me know if it's not quite what works for you guys and I'll adjust it.