First cut at improved rational_adaptor.