master
Cleanup as suggested
Apply DescriptionCloner to modules generating multiple cfi
Review verbosity, addressing comments by C. Vuosalo
Squashed commit of the following: