Even more cleanup of Runtime.h and Runtime.c