clean up syntax to match style guide; bug 976547

This lints within acceptable parameters:
```
$ puppet-lint --no-autoloader_layout-check --no-80chars-check *.pp | wc -l
    0
```