cpp: got rid of remaining 'using'