A little cleanup to FlightTask hierarchy

Also fixes a bug where bins were not being recomputed when they should
have been.