Improve puppet snipets.