Replace two low-level gvc functions with the appropriate high-level function.