Clean up puppet

Lint all the things.

Top-level namespace warnings in 3rd commit need a close look.