Aggressive cleanup in util, including CLI tools and data structures. Major work on FLY-1 and FLY-4.