Move helper code into helper namespace.