cleanups; optimize CALL_VC() usage