New analysis, some cleanup.