rpn2solr: reformat (same as "master").