Tidy up the return value docs in this file and I think this is ready to :ship: