Two very minor cleanups