[NCSF] Very minor cleanups.