Can I defer this to a post-release cleanup activity? My concern is if we put the static methods elsewhere, I'll have to change a lot of call sites which is more code churn than is probably wise at this point in time.