Improved generalized rv support.