runtime: remove stray use of return#
tools: follow name eval -> apply name change in base library