Better reports. References #109, #111.