No, I think we were just used to (...) and converted over to (any) at some point.  After we get things all checked in we will need to do the replace (...) and test everything, but yes, the goal is to go away from (...) like you suggested