I wasn't aware of that hook, that seems like the right place to do it, and also eliminates the redundant logic.