tweaked intra-package imports from cbook