I agree, but then it asks for the error handling subsystem, which is probably welcome change, but not in this PR.