Clean up some lingering TODOs in puppet 3.6