pbrt-related cleanups