Tweaks to support tags in puppet files.