fixup! Finish up rework and add support for file descriptors.