Yeah, that's a good idea. All in all it will save us some code and make refactoring much more pleasant.