Syntax cleanup, continuing preparations for puppetdb