Small cleanings for interpreter code