Minor internal compiler/runtime code cleanup