Made defaults depending on PuppetTarget.DEFAULT everywhere.