restructure a conditional to deal with apparently-deprecated puppet behavior