modernization: improve --rva