[FOLD] Tiny cleanups