Simplify status reporting (#1918)