Minor compiler/runtime code cleanup