Remove function pointers in output, simplify error handling