Somewhat improved post-processing of results.