1.5.4: Tighten data cleanups.