Minor source cleanups