builtin-remote: rename variables and eliminate redundant function call