I thought we specifically decided that the function should not have the side effect of adding the class to the catalog.  Did I misunderstand the end of the discussion on puppet-dev?