Add more functions to the non-intrng case and remove a return statement
from a void function.
More cleanups to allow us to build without intrng