Rework on FB 3,34,35,39,44,41 in prep for OpenADE review.