SolrRequest refactor WIP

Whilst addressing some issues, like #38. WIP.
Avoid using {...} for multi-line blocks.