Get `rake spec` working with refactored code.  Clean up `rake lint` complaints.

`rake lint` didn't like "selector inside resource block" in file{ }
declarations, but all the nested selectors in params.pp seem fine.