fix more variable scoping for puppet 3.2