escape use of which; add bundle helpers