Just a tidying up.  No functionality change.

Just housekeeping so this module is more like a typical puppet module.