Prep cleanup for FLY-1 and FLY-4.
Nit fixes.