Refactoring how indirect nontemrinals are handled.